Style tweaks
correct drop down lists not displaying on add user
sublime edit
salt password changes
James Branch
Merge branch 'Jasons-Branch' of https://github.com/yorkshiregeek/WJPS_Portal into Jasons-Branch

Conflicts:
	portal.sublime-workspace
Merge branch 'WJP-Branch' into Jasons-Branch

Conflicts:
	portal.sublime-workspace
Merge branch 'Jasons-Branch' into WJP-Branch
Post merge with Jason
None
New Base
Merge branch 'WJPS-Portal-Base'