general updates
 'master' of https://github.com/paulkennethkent/marvn_pro
git merge master
major style changes, trying to get to grips with variables and less