incorporate feedback
Merge branch 'master' of github.com:osuosl/seniorproject2014
move stuff around as per jordane's feedback