first performance tweaks
upped version num
added gem for performance testing
got performance tests working
readme tweak
set ruby-prof version
fixed recursion on admin/setup
fixed conflict error
Merge branch 'performance'
Merge branch 'setup'
resolved conflicts from merging hotfixes back into develop