5 commits

Author	SHA1	Message	Date
Connor Turland	11e57c1b37	rebase onto develop which now has API and pundit	2016-03-13 10:36:38 +11:00
Connor Turland	3aec00e07c	just don't include mappable for now	2016-03-13 02:28:39 +11:00
Connor Turland	ada29c6832	cleanup	2016-03-12 21:35:56 +11:00
Connor Turland	77d39d6649	redid so they won't interfere	2016-03-12 09:48:07 +11:00
Connor Turland	059591b78b	first pass at important API endpoints, token auth	2016-03-11 17:16:04 +11:00