add proxy support and custom location values to nginx.  fixes #901, fixes #916
minor regression update
fixes #974 add client_max_body_size
Adds owner/group to default vhost data
Fixes issue where RVM complains about being out of date
Merges fix for #1203, #1094
Closes #1227; Squashed commit of the following:

commit 3497213952436a3d2e69a1e851af732b985ce55e
Author: Juan Treminio <jtreminio@gmail.com>
Date:   Mon Dec 1 20:20:00 2014 -0600

    Removes reference to ManifestController; #1227

commit 22eb32c98529f56a4c990812c840aa9126ed2d62
Author: Juan Treminio <jtreminio@gmail.com>
Date:   Mon Dec 1 20:19:39 2014 -0600

    Moves Vagrantfile* up one level and removes extension slug; #1227

commit 4880dda01f9549e6f3217112d56e3d0b8315deb8
Author: Juan Treminio <jtreminio@gmail.com>
Date:   Mon Dec 1 18:46:52 2014 -0600

    Moves form templates up one level; Renamed Vagrantfile* templates Vagrantfile; #1227

commit ffa8460b2e57db839e575b86d079b5f47e654007
Merge: 9c2be43 10ba171
Author: Juan Treminio <jtreminio@gmail.com>
Date:   Mon Dec 1 17:18:18 2014 -0600

    Merge branch 'master' into 1227-simplify

commit 9c2be43b36ac1c336ba19c70c428e581b9098915
Author: Juan Treminio <jtreminio@gmail.com>
Date:   Mon Dec 1 17:09:56 2014 -0600

    Removes references to manifest controller from services and routes; #1227

commit 60863096b97e92ce2cfd373825bebdc436cfbb48
Author: Juan Treminio <jtreminio@gmail.com>
Date:   Sun Nov 30 15:09:11 2014 -0600

    Removes .librarian and .tmp after running librarian; #1227

commit 2d1d5f5b0eba0169520830c2282d464cda78d2d6
Author: Juan Treminio <jtreminio@gmail.com>
Date:   Sun Nov 30 15:08:42 2014 -0600

    Ignores .tmp from librarian; #1227

commit 0b9d8b7e715a80a8a5058fc3f45f4c9dda570569
Author: Juan Treminio <jtreminio@gmail.com>
Date:   Sun Nov 30 14:29:04 2014 -0600

    Move all Puppet files into archive folder; #1227

commit 4214ccb33b8c4d3b0e2a4346d1eea2ae754df919
Merge: d5f8f39 b56dffd
Author: Juan Treminio <jtreminio@gmail.com>
Date:   Sun Nov 30 12:02:42 2014 -0600

    Merge branch 'master' into 1227-simplify

commit d5f8f394915b93d9b96888dbe461f820b501e8df
Author: Juan Treminio <jtreminio@gmail.com>
Date:   Sun Nov 30 01:52:32 2014 -0600

    Replaces all method in Configure classes with array; #1227

commit ff37eb62f811e8b3936d9d691b1b71e387d29b6b
Author: Juan Treminio <jtreminio@gmail.com>
Date:   Sun Nov 30 00:44:34 2014 -0600

    Removes getSources() functionality

    Reads Puppetfile in project root and dumps contents into
    zip file's Puppetfile;

    Previous functionality was not taking into account versioning,
    and this solution is much cleaner and simpler to keep track of. #1227
Merge branch 'nginx/proxy' of https://github.com/steverhoades/puphpet into steverhoades-nginx/proxy

Conflicts:
	archive/puphpet/puppet/nodes/Nginx.pp
Spacing; #1021
Spacing, missing $; #1021
Points template to new structure; #1021
Fixes checks on missing variables; #1021
Removes jemalloc download
Adds check for location_prepend before iterating
Updates nginx to v0.0.10; Closes #1169
Revert "Removes DigitalOcean while API/plugin are broken"

This reverts commit d762983a3d683b1bfe28784980418b9aadaa868e.
Added Apache Solr support.
Merge branch 'solr' of https://github.com/RoSk0/puphpet into RoSk0-solr
Updates PR to new structure; #1216
Reverts change to hiera_hash() function