4 commits

Author	SHA1	Message	Date
Matthew Dillon	0ab0cf5a6a	Merge branch 'master' into clostridium ... * master: Remove duplicate mixins auto-reload compare/results model, cleanup	2015-07-14 08:03:21 -08:00
Matthew Dillon	60f518d911	Remove duplicate mixins	2015-07-14 08:02:49 -08:00
Matthew Dillon	f295082592	update merge from master	2015-07-13 16:32:03 -08:00
Matthew Dillon	eb1a8bb6e3	protected route	2015-07-10 09:29:12 -08:00